Remove int bug workarounds in tests