Get tests running, at least. Clean up default template