G18/MX2: Changes to test defconfig