More member variables and setUp stuff in tests.