Split E2E tests into 'Integration' and 'System'

Separating out the tests helps to flatten the directory structure a bit and
remove some of the cruft. Also replaces ill-defined custom name for a part of
the testsuite with the standard automated testing names.