Fixing clone generation and clone testing.