Another go at making the extests pass