Fixed other tests that were impacted by the modifications to the system variable replacement function.