Small mp changes and tests