combine add/remove tests