cleanup test separation, fixed structs (broken)
cleanup test separation, fixed structs (broken)