Cleaned up v6 TestBase
Changed include user/group tatic.
Merge branch 'master' of github.com:CHAOS-Community/Portal