Use cl-lib functions instead of cl in tests