#22 Refactored and tested TypedValue.