EAGLESIX-2707 added test cases to better match the c++ tests.