return code to original, maintain unittest