DROOLS-7 Phreak
-fixed more failing tests