fixed utils to work and run with tests