Another try for getting the test set up correctly.