Updated all function tests to new organization.