Added some goto to skip extraneous tests