Use explicit struct types in tests