Got the tests to run again after the code reorganization.