Fixed compatibility with Mx5,  Improved test project