Wording and tests on WithHandler, WithoutHandler
Factored out the Fluent WithHandler tests into a different test class