Merge branch 'improve_two_loops_testing' into 'master'

Improve two loops testing

See merge request !88
3 jobs for master in 20 minutes and 11 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Build
passed #171216
docker-build
build_linux_36

00:17:48

64.0%
passed #171217
macosx
build_macosx_36

00:18:06

64.0%
 
  Deploy
passed #171218
docker
deploy_beta

00:02:03