Test refactoring by the West Arete Team to clean first instead of after, use selectors, and standard test support
All test passing and integrated into the main spec