Merge branch 'grummbeer/tests-organize-helper-tests'
PR https://github.com/mantisbt/mantisbt/pull/1985