Correction following unit testing