More Jog testing changes