Updated some testing, removed some unused old code.
Merge pull request #29 from VanGrack/adding_object_testing

Updated some testing, removed some unused old code.