TST/STY: Cleanup of the test suite for util