fix test case error
finish clean code