Moved scanning for services into separate file, added some tests
Merge remote-tracking branch 'origin/master'