Refactor Target test