Fixed some more unit test warnings