Add tests for reporting; implement reporting