Handle remaining integer fields and fix tests