EAGLESIX-3083: Added more working test cases