I have adjusted to use @test_data throughout, so not technically moved -- but the net effect is the same (less instance vars)