- Remove data-test where not necessary - Refactor tests to remove tests that belong in ReportRow - Fix story