Fixing member variables and imports.

Now the test is working.