Add a marginally more logical set of test fixtures, update tests to match.
Add a marginally more logical set of test fixtures, update tests to match.

BenMotz/cubetoolkit,BenMotz/cubetoolkit,BenMotz/cubetoolkit,BenMotz/cubetoolkit