Added handler test and function.