Joined testsuites (allows for total test count)
Merge branch 'master' into plugins