Test fix and test debugging