Added runNullCollector + minor refactoring

Extra cleanup/refactoring + added null collector for testing purposes. (Also if one would prefer to publish into a black hole)