Added service and more integration tests [again - commit with missed
files]