Added some more functional tests.