Issue 4071 put

Tidied up a couple of tests