finally got the unit tests to compile again... (but some of the tests fail!)