Refactor Value test to new model.