Minor bug fixing.
Merge branch 'feature/behat' into develop