EAGLESIX-2695 Improving the tests, correct code bugs. More To Come