Tests now run again. Fixed a bit of API-rot in the tests.