Override for cde-core-tests