clean test code and few comments