Convert IDs to Integers, fix test errors