Moved to new functional tests from 3.0 branch