Add basic test for internal store
Merge