Make Tests compatible with mist_upgrade changes