added more functional tests.