billing with _test prefix fixed