Revert "factor in GENOME_SOFTWARE_RESULT_TEST_NAME into the version"

This reverts commit b76311302c51a1c82828e8f1f00a5ca498f9566d.

GENOME_SOFTWARE_RESULT_TEST_NAME is not always set so this had no
effect.  Will look for an alternative solution.