merged data functions into utils module
some tests fixed