made tests pass from last merges