Add SemiAutoCapture on button X and cleanup old test code