Another test for put and a little clean-up