** To Squash: Fix properties and add test case for custom-handler