Update: more idiomatic tests
update: move structs with test data into tests