more succinct test cleanup
possible abstraction of record models