Change 'builtinKernel' to 'testType'. Extends calibration kernel to kiters=40.