Merge branch 'FixCI' into 'master'

Fix failing tests

See merge request !9
2 jobs for master in 3 minutes and 1 second (queued for 1 second)