fixed tests, all green now
Merge branch 'fixing_tests'