Rewrite Value tests