MapLockTest clean up, simplified