Reverted refactions to local::mutex
Added condition_variable tests