Merge "Uncomment some accidentally commented tests."