Cleaned up unit tests for the report