Revised (in progress) services, test helper, and tests to be more self-contained, exhaustive, and catch errors.