unit tests fixed