Reinstate test skipping when comparing previously obtained tests.

Also ensure skip_job is only run once.