Refactored integration tests
Merge branch 'master' into behat

Conflicts:
	Tests/Integration/Context/FeatureContext.php
Merge pull request #331 from stefk/behat

Integration tests refactoring