All tests should now pass with improved messages