unit tests fixed & syntax fixes