Refactoring and adjustments for Cider-CI 2