Merge branch 'tiny_test_fix' into 'master'

Fixed bug in test.

See merge request !16
6 jobs for master in 1 minute and 43 seconds (queued for 2 seconds)