Change group name for very long tests (from ">30m" and "1h" to "verylong")
Merge branch 'feature-tests' into develop