Addresses #2 - adds a test structure, but no real tests
Merge pull request #3 from evillemez/tests

Addresses #2 - adds a test structure, but no real tests