tests broken on 2.3.4