Added my portion of tests and made small updates to classes
Worked on my portion of tests, small changes to classes