Updated tests to pass with MPT3