Commit pending test changes
Merge pull request #50 from lujameva/master

Decouple rules manager from ATG
Fixed broken test