Fixed Jsp problems and rerunning to fix flapping test