Refactor Target into Interface to Enhance Testability