Add more functional tests.