Changed all tests to only throw Exception