Add more api test coverage
Enable custom handlers for api