This is very complete, but is really not necessary to add it in *each* test. We should have one test that ensures the right classes are created, and keep each individual test focused on what we're testing.

I won't hold back on merging this PR because of this, but please bear this in mind for the future.