add handler class and simple unit test