adding test coverage
removing unused utils