Moved functional tests