More fixes for multi parameter type classes and a test.