Merge "solve test code bug"