Updated test to better account for timing / race condition