added more testing to unlock