* Fix concurrency issue in test; should be fixing flaky test * Replace 'incrementAndGet' occurences with 'getAndIncrement'