Restruct and UnitTests