Updated code from latest the PicketBox CDI version. Fixed test cases.