Added tests to check both Simple Locks and Normal UI