cleanup and updates to get the test suite to compile