Functional test debugging & improvements

issue #1702