Fixing tests
Merge branch 'fixing_test'