updated tests so they pass again now that we have separated meter into
meter_class and meter_instance