Next CPU upgrade unit testing fixed