Move everything back to features
Testing branch:fix_behat_inheritance