explicitly use functional-test plugin 2.0
fixes to functional tests