fixed tests after pull request 279
Merge remote-tracking branch 'origin/master'