Changed multiple files to pass two tests on data storage