FixersResolver - make class more state aware and enhance it's tests