Merge pull request #199 from akkie/master

Some tests need a started application