Get tests more or less running.
Commit WIP...