EAGLESIX-2651: First: fixed bug; updated tests