bugfix for 744
Merge pull request #754 from GiorgiyLutidze/bugfix744_2

bugfix for 744
Another bunch of fixes for tests
Merge remote-tracking branch 'upstream/master'