Add a test of a handler, refactor how scenarios work to simplify tests.