There are a few tests that don't override it.  Do you think I should just un-hoist this statement for those tests?