Add thread safety test
Finish thread contention tests