Replace add-content with add-value and get-content with get-value
Remove unused test cases