add tests for Utils + remove unused code