Fixed the things that broke the CI build /tests, these changes are temporary workaround, not permanent changes