Restored more tests in operation.