Fix id-based tests that had non-int ids