Collector complete with unit tests and rest service working