More tests; New structure to test case naming