added options to the functional tests