Fixed the remove feature and added more testing