Changed test setup and made RWLock static