debugging
Fixed custom handler bug, and added unit test