Fixing modelled STS tests to not include nested JUnit suites