EAGLESIX-2700 reviewed code and test cases.