bugfix
more functional tests