Merge "Fix bug not accounting for type in induction comparison. Extended unit tests."