Use templates for untested ones
Added test_date