- added and modified some jUnit tests
- minor bug fixes