Re-writing tests with better factories
Using organisation admin factory for tests