Merge branch 'kjvdh/features/testing' into spikes/koen