(I recognize that there are probably other tests in this file that need to be ported over to this pattern as well--sorry for the confusion.)