New fixtures for tests
Merge pull request #3 from tschaub/integration-tests

Better integration tests.