refining targets names and adding targets for testing