Add Riemann reporting
Add tests