More deterministic tests, and enhanced Rand