Add method unlocking + unit test
Fix lock method unit test
Add unlock method & unit test full coverage