Thinking about tests
Refocusing and streamlining