Working on tests and add notes for remove