Simplify feature test to make date-independent