Fix broken code/tests after api change (support of usage billing)