Updating makefiles in util/tests
Adding util/tests directories in build directories.