Code to add tests got messed up in successive iterations to fix Cmake code. This ensures that tests are now executing as expected.