Better functional tests