Improve Test Labelling
Refactor for Readability