Some tests passing again...
New Resolver is Working
Remove replaced old Resolver related classes