spelling, better setup/teardown, check around existing lock