Temporarily comment out old put.
Fix up tests to use new methods.