Refactor tests
Accept headers only
Request HTML
Return HTML for JSON

for now, until I make it HTML properly
Refactor features