Bring unit-tests up to speed with type changes