Added two more handlers and tests.