Fixed tests that were using incosistent type name in their mapping.

In master (1.0.0beta) we have added a check that makes this fail. The check it self is not backported to 0.90 as it is not comptabile but we want to keep the code base as similar as possible.

See #4038