Adding tests, correcting a couple method misspellings