Better dummy, fix some things in template
Remove old app
Complete test suite
Remove unnecessary test