adds remove/delete functions and and tests