Catch billing up to master and fix tests