JumpTest refactored