Remove test again as it still randomly fails
Merge remote-tracking branch 'origin/master'