Updated to support a large test build suite if requested

Minor cleanup of test script