Adding Brad's Homework2 test code
Fixing bugs in Homework 2