Moved test to appropirate class.
Added self unlock test.