LockServer tests, updated write-up, and bug fixes