Further refactoring for test stability, and remove unused data selectors and functions
Attach a file by drag & drop or click to upload
