refs #603 - Updated tests
Merge remote-tracking branch 'origin/develop' into fix/report-filters