Refactored behat feature set
Merge pull request #5 from tomphp/testing/behat-tidy

Refactored behat feature set