Dominic: fix broken tests