Improve lock check output. Add more validation samples.