Fixes for int tests now that 2.0-rc-1 is being tested as a previous version.