Updated the tests so that much of the initialization is done up-front
rather than at test time.