EAGLESIX-3083: More test cases working