add assert u2
fix directory path from cherry-pick
removing emulated storeage