HandTest refactored