Merge branch 'fixtests'