Mac tests refactored for new mouse handling