Better test coverage for remove/add function - ensure's the count is updated accordingly