Simplify symbolResolver and add test