WIP: tests passing w/o has-handler/has-state