added messaging
fixed conflict in tests