did refactoring to create base org for running tests on it, fixed failing tests