perform code-refactoring; Ignore sample tests