Merge "Email: Fix StoreTests"