created module Util and refactoring in tests.