more refactoring
utils tests