massage datestamp more better
improve test cases; start using mock