Change structure of tests, and begin to implement connector 0