remove related tests also to make dev green, since its logic is changed