Update test to reflect changes in ExpressionCollection
Add sanity checks to expression