Reformatting only.
More progress on connections vs. collections and services tests. 49 of 74 now passing.