Started fixing old tests to (at least) compile