Minor changes to performance test and cmake