WIP: adding conditional test targets