Completed unit tests for util