Closer to all specs passing. State is not resetting in tests.