cp, test_billing tests passing