Forgot to skip these tests... I need to fix templates and handle()