Code cleanup to begin adding more scenarios, came up with a plan for verifying reads