Restructuring of test setup.