Any variancia removed and a couple of low level unit test added.