Test changes for metering testing