More changes to make tests run better
More changes to make tests run better

xtracoder/bnd,psoreide/bnd,lostiniceland/bnd,mcculls/bnd,joansmith/bnd,psoreide/bnd,joansmith/bnd,xtracoder/bnd,lostiniceland/bnd,psoreide/bnd,lostiniceland/bnd,magnet/bnd,mcculls/bnd,magnet/bnd,mcculls/bnd,GEBIT/bnd,GEBIT/bnd,magnet/bnd