Feature/resolver

Resolver has been implemented including its tests

Along with this, I added 2 missing tests which now puts the tests at 100%