More testing and CI..