Fix for m().cls, Test suite improvements