ModeShape upgrade to 3.6, including necessary change to test PEP

fixes minor issue with test PEP, such that simulated PEP still returns expected responses for test.