removed overcomplicated unit test in favor of integration test
Re-implemented user-org finder
renamed extractor to reflect function
try fix for surefire.forknumber b0rk in intellij
minor cleanups