fixing unit tests
fixed conflict in tests