Test Fixes - Use an own group, removing transactional approach

As there are many commits, I preferred not pushing it to upstream, although it solves several tests and adds stability to the test system