Revert "fixed failing test because of UnboundIdentifierException"

This reverts commit ec20ac7da43d28f8511686cc56c4eb6a921558df.