Refactoring tests on cork_on