changed name of function and touched up tests