Restructuring, testing