Merge branch 'fix_tests'