Firming up returning models from add and remove, plus tests.