Merge "Add tests for type through recorrection"