Added more handlers and their tests.