Adds slightly more complex functional testing
Merge pull request #2 from repeatingbeats/moar-tests

Adds slightly more complex functional testing