more unit tests fixes