Modified the date spec and added some other test cases