Added a few of the handlers functions and tests.