fixed tests by not using an old label option
Merge branch 'bug-broken-tests' into develop