Added most test cases for assignment3.  Still need to be double checked