Fix for acceptance test broken by merging Leons branch