refactored tests to fit new messages, removed underscore