more functional tests written