Clarify name of test
Allow if none expressions to reference variables