remained test code cleaning