EAGLESIX-2704: Fixed functionality and test cases