Put in old BaseDataTest, modified before and after annotations to aid flexibility