Split apart the tests for add (remove will probably look similar when it is done)