- added more junit tests
- fixed some failing tests