Tests Exceptions fix