ElementResolver and ElementStorage fixed
tests: many fixes