Fixed tests
Merge branch 'fixing_tests' into dev