Add tests to handlers