Tweak button hit detection
Remove bunk test