Change structure of test suites, make tests more comprehensive