Added tests for MAGE-4590