Fixed errata testing code with recent changes in the process