Break up large project file into smaller files
Modify unit tests