Modified some tests to answer homework questions
Fixed some comments