Merge "Replace skip with skipTest"