Add some failing tests for FallbackHandler
Make the FallbackHandler tests pass - fix #6