Changes back to meta_value.
Formatting and test cleanup.