Add tests for remove() and put()