Added services tests.
Changed to 8 results. Removed a broken tests - more hassle than it's worth.