renamed types in marshal test (sorry, it's late 😴)