fixes for functional tests