Merge "Start bringing back legacy storage tests." into qt-dev