fixed up the tests; need to figure out setup/teardown