Tidying up test messages