More testing and CI...