All unit tests fixed