[GP,MH]{refactoring} Remove test data from store, add it to test case