Commit early and often - more tests added