merge from Carleton and make tests green(ish)