changed add and remove tests to expect new behavior
merging
trying to merge :(