clear unnecessary pending tests
consolidate tests
consolidate more
return DateTime for great consistency
refactor tests