TESTS: Fixes to the WRITESAME tests