Add more function tests