Update psych and its tests to the 2.0 versions.