EAGLESIX-3015: Working on matcher test cases