Bug fixed&test finished