Wreck tests and fixes