I also got rid of the module specific local variables that could potentially cause cross-test contamination. These are now instance variables.