Extend functional tests