Test suite overhaul, merging declarative and classic suites