Updated the tests to include better messages.