Update handler responses
Capitalize responses
Add extensive, but incomplete, control + handler tests