Refactored testing code
Merging new changes
Merge pull request #20 from kaitlinhuben/master

Removing unnecessary files