WIP refactoring rowValuesGenerator and specs, adding ValueGenerator and specs