Explicitly test remove by id and by query

This separates removal with a string ID and removal with a query into two tests