make test thread only fail when necessary
Merge pull request #1090 from marcel-blonk/develop

make test thread only fail when necessary