Refactoring, Organising Tests More Cleanly, Cut Repetitive Code, Adjust Some Attribute Readers