Updated test messages in line with feedback on Pull Request #21