OR-873 Update tests