Tests compile now (still don't pass…)
Fixed the tests.
Fixed the demo app.