Various test suite fixes in light of recent breakage. The remaining failing tests are yet to be written / implemented / fixed etc.