Implemented some data utilities, improved test coverage