Moved skip into test functions