Enabled race detector
Refactored tests and removed unnecessary code