Renamed a function per code review... then fixed tests