Tested: refactored tests to be more explicit when it comes to exceptions