refactored cat1 roundtrip test

added relevant fixtures, removed extraneous fixtures, fixed affected tests