Fixed billing tests and adjusted headers