Making it ready for CI