Boundaries and MS-Word tests fixes.