Enable the data cleaner and do more tests