Fix newly identified issues to make our test suite more robust and faster, phase 2

Original created by @intrigeri on 10096 (Redmine)

To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information