fix edison ccm toolchain and nersc host variable tests