fix other tests busted by changes