fixes some more unit tests