Closes #1, #6, #8, #12, #13, #16, #17
Deleted DictionaryTests (it was old)
Ethan: Closes #18, #5, #3, #7, #4
