[DROOLS-293] Test cases
[DROOLS-293] More fixes
[DROOLS-293] More fixes