Re-set default test modi
Merge remote-tracking branch 'origin/develop' into develop