more bw fixes
more bw test fixes
fix assert_objects_equivalent