Fixed Wording & Added Tests