Restructure test cases and upgraded test environment