COMP: fix compile errors
BUG: fix failing tests

https://github.com/fedorov/Reporting/compare/c0277fd389...360c8484db1
Merge pull request #535 from fedorov/update-Reporting

Update Reporting