Updating code/tests for default readwrite behavior missed before