Minor: Integer → Int
Fix db tests after changes for #1647