EAGLESIX-2651: Last: fix minor bug; update tests