- fixed some issues with the reporting
- added some test cases