Merge branch 'feature/tests' into 'master'

Basic Testing

See merge request !88
10 jobs for master in 5 minutes and 14 seconds (queued for 1 second)