I think we should organize tests by method-under-test. Maybe this should be more explicit?