Fix logic and comments.
Remove wrong behat test.