Use localhost for postgresql tests
Fixed ordering of billing_type display