fixing tests
fixed conflict