Merged in first batch of gridstore tests