Make tests use the same width integers