test files: use cl- prefixed functions, and require cl-lib