changing test file organization and switching to factories instead of services