update tests
fix merge conflict