remove $and between date
remove test data