Add resolver & mutator tests, fix erasure warnings