Editing CI settings and fixing tests.
Merge branch 'master' into version2