Add more tests for handler.