- Fixed unit tests
- added klocks and klocks tests