Dominic: fix tests