Adding functional tests support