Passing all unit tests for data persistence