Fixed unit test bug exposed by 'test -race'
Fixed unit test bug exposed by 'test -race'

scootdev/scoot,scootdev/scoot,twitter/scoot,dbentley/scoot,dbentley/scoot,twitter/scoot,dbentley/scoot,scootdev/scoot