fixed tests
Merge branch 'fix_tests'