Fix for MAITI crash
TestSuite improvements