Added -short flag for tests.