Moved from defined number of tests planned to a more dynamic testing structure to ease adding new tests.