Fixed functional tests
Merge pull request #388 from Bladrak/fixBehat

Fixed functional tests