fix merge conflicts from test files