fixed tests and Util class