yet another few small test fixes