Review3 - Bug fixing, tests of all scenarios

All review scenarios have been teste and run through Jetty integration tests.