tests: make lock tests stable against running 'py.test -k user'

Add some cleanup, and merge some tests to make sure they really have a
well-known starting point.