Dominic: update tests