Use a helper method to skip over some execptions

Cleans up the tests a bit