Update tests to work via roundtrip, and add scaffold
Remove out fixtures