Clean: UnitTest
Cleaned codes which had been commented out