Updated Utils and Unit Tests.