EAGLESIX-3015: Working on unit tests