Re-added ConsistentKeyLockerTest which is the only failing test case. NEED TO FIX.