Add beginnings of functional testing