update to simplified test structure, one test per testcase