Class is being cleaned up - tests are irratic