Tweak on the put script, complete the tests.