more brainware fixes 2
more test fixes 2