Changes to tests so that they're not system dependent