Made minor changes to the second commit which broke tests out into success and failure tests taking advantage of pytests.raises. Additionally updated several grammar issues. Continues #2794