restructuring, tests, etc