Adding test messages and removing unneeded tests