pulling out tests that add/delete, need to figure out mocking....