fix remove tests