Fix bugs in hunt from test