- added reporting
- modified tests