Update test messages to match tests