added more functional tests