reorganizing test code
reorgnizing test code