Make bridge values consistent

Be consistent in the bridge values for which we test.
Note that bridge=true and bridge=1 are no longer in use.