Fixing unit tests for the non-concurrent bug's fix. Adding new manual
tests to test the real concurrent execution