Add more handler_test.go tests