Actually fix merge problems, add FET test