Removing even more unneeded test messages