Re-enabled rest of surrender unit tests