Revised some Unsure methods and added tests