Fix maestro tests