Added partial PUT tests (and fixed embarrassing errors caught by them)

Only failure conditions tested; actual merge functionality to follow.