Refactoring for easier value testing