Added tests for custom handlers