Add clean_flag to test cases