Add put and remove with tests