Updated Tests

Added all the useful items for test and fixed most everything
Merge branch 'master' of https://github.com/mtank/CS4370Project3