More int test fixes