Addressing comments and fixing errorHandler test