Reverted change since it was not good.
Minor refactor again.
Updated utlis tests.
Added settings to speed up tests.