[WIP] All tests back to green.

TODO: Smoke test in dummy app