Resolve race conditions in code and test with race detector enabled

[masih]

With the need for parallel validation, make sure that:

• the current implementation does not have race conditions.
• run tests with race detector enabled.