Convert the last remaining Functions to the new tests