This PR neither adds nor updates specific test functionality, but does update the wrapper scripts based on @tcooper's recommendations for consolidating all flavors for a particular version into a single build.