Fixing tests after c9bc13e