Start listener helper and minor change test
Add OSGi DataSourceFactory properties building