better test cleanup, prep for query impl