Continue refactoring out static fields
More refactoring work
Able to delete an extraneous class!
One more static reference refactoring
Add the first full-scale test case
Also demonstrates some advanced Dagger usage