Use correct targets for building and testing