Since there are no feature changes, most of this is just making sure
that the components are set up correctly in the tests.