Tried to make the test more robust on the buildserver and to speed it up for faster machines.