DRY
Store spy contexts
Test coverage
Merge stubs and spies into doubles
Reorganize tests
Internal reorganization