Added notes from discussion; added some of the remove tests