Make some test messages clearer