these can go, as can the test case cruft for them