trim test codes / correct errors in ver.0.2.4