update test case name and restructure test setup.