more performance test cleanups and added Test of simple locking strategies