Merge py.test configuration