add tests and adjust reporting