Org tests UI: converted org tests to factory