Some more test fixes after int patch (#291)