Add more functional testing.