util tests and remove dead utils