Wip

Head of this has some fixes on that may be of interest.
Yes, no worries, this test sometimes fails without good reason. It may be related to heavy load of Travis machines.

Btw, Github formatting for code is 3 backquotes: ```