Merge "Removed invalid skipped tests"