Added handler loader and test cases.