Refactored TestValue a bit