Rearrange tests slightly
More spec organization
Spec refactoring
Small refactors
Delete unused methods in support files
Add regression test
Use options accessor method
Actual regression test