change user creation in test helper
Merge remote-tracking branch 'upstream/master'
add timeout in start function
Merge pull request #154 from poupotte/master

Add timeout in start function