Added remove_reservation and tests