Add diagnostic fix to remove unnecessary wrapper in type mismatch

I also reorganized the tests in a more logical order

Author: Giga-Bowser