Added test data and modify date picker functionality