refactored cat1 roundtrip test, added relevant fixtures, removed extraneous fixtures, fixed affected tests
Merge branch 'cat1-roundtrip'

Rebasing and merging pull request #102