Fixed all functional tests.
Merge pull request #914 from maykinmedia/bb-1916

Fixed all functional tests.