add integrated tests; cleanup unit test; fix poorly invoked deletes