Bugfixes for my last PR

I made a fix to my last PR (INFRA-1346). This should stop the messages from appearing for unittest_annotation.