Commenting out most tests as the format hasn't changed.
Conflict resolution.