Update for including additional function tests.