Restructuring for Tests