Functional tests modified