Refactored Resolver dependencies, changed arrayaccess for make() and added basic tests