Coverage has now a more forgiving timeout of 4s instead of 1s.
Merge branch 'test' into dev