added test
fixed test
Merge branch 'ClearDateTest' into Development