Splitting tests that were all lumped together in NFATest to more appropriate classes