Merge pull request #3 from mfriedenhagen/master

Replace two long running integration tests with unit tests.