Fix enough that all tests at least run