Make tests compile

The tests need a lot more love.