More unit tests for util classes