Correcting issues with unit test target.