Improve the tests to not autobox things.