Improve spec, add whitelist special case