Clean up test fixtures. Fix backward linking bug.