EAGLESIX-2651: And: rm old unused test code