Merge brunch functionalTests with develop brunch