adding tuple level locking, fixing tests and commenting few tests