fix tests
Merge branch 'master' into issue-2