Got Value code coverage to 100%.
Some more refactoring while starting on Data\Data tests.