Fix race in test, simplify

Signed-off-by: Jonathan Rudenberg <jonathan@titanous.com>