Added integration tests.  Fixes #13