Working on ServicesFinder and tests.