renamed/reordered tests to match the reports