Merged
New test configuration