fix tests
added extra date check and fix