tests for client lock with Custer problems

Cleaned up, and auto merge able 

version or RP #1812