Resurrect various legacy tests