Fix office tests