REPORTS-54: Refined tests

This should track changes for REPORTS-54