add and remove tests