more unit test work