Re-add tests
Fixes a lot of stupid stuff
Rework dashboard template hierarchy