Printing of types has changed slightly. Also improve the error messages the test gives when it fails.