resolver unit tests
unit tests adjustments