Merge "Adding more Readback tests and refactoring"