Removing remained references to language :(
Fixed rules tests by removing Mocha gem
Fix merge in the rules controller