use constant for metered billing type, and fix classname of test