Missed a few replacements, fixed tests