Correct some test and add test for date picker