Fix handling of 'skip test'.
Custom version