Added more billing related tests
Added more routing tests