EAP6-92, EAP6-125 - added further test cases
EAP6-92 - minor modifications