cross store tests fixed