Reverting change in QueryTest. Removing tests from CoerceExpressionTest that are not really needed