Fix Tests, and CI