EAGLESIX- filling out the test cases, minor changes to expression classes.