Fix failing tests
Change build status images
Merge branch 'fix_tests'