2124: Fix billing tests