Tests for service maker.
Clean up some things that coverage pointed out.