Commit forgotten part of the test simplification
Commit forgotten part of the test simplification

junovitch/pkg,Open343/pkg,Open343/pkg,khorben/pkg,en90/pkg,skoef/pkg,en90/pkg,khorben/pkg,khorben/pkg,junovitch/pkg,skoef/pkg