Fixes for i69. Removed some unnecessary code, fixed the title of the sub-test, used assertEquals to evaluate if the test was successful (as opposed to assertTrue), and fixed several very wrong comments,