Adjust example for unit test
Adjust example for unit test
Big commit: re-shuffle code; move dbs parts from combined service into dbs2/dbs3 counterparts; adjust mappings