Refactor untap phase test