First step of refactoring tests out by category
More refactoring ahead of splitting tests out by category
Refactored spinner out into separate project
More minor refactorings, in preparation for splitting the tests up by category