update test.
clean up others.