Cleanup in a test
CastExpressionFix
Updated test data since another quick fix is available.