fixed tests
Merge branch 'master' into test_fix
fixed final tests