Minor changes to get the test cases running