Add new test
Move dynamic handling out of Binary::DoResolve to reduce stack size